From e66be7e48421f0a67f29dd7d572d42c7627807c7 Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@citrix.com>
Date: Wed, 13 Mar 2013 17:42:17 +0000
Subject: [PATCH] xl: add vif.default.bridge
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This is a replacement for defaultbridge xl.conf option. The now
deprecated defaultbridge is still supported.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 docs/man/xl.conf.pod.5 |  4 +++-
 tools/examples/xl.conf |  3 +++
 tools/libxl/xl.c       | 13 +++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index f8f7e7fc79..31aebcaa90 100644
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -76,10 +76,12 @@ Configures the default hotplug script used by virtual network devices.
 
 Default: C</etc/xen/scripts/vif-bridge>
 
-=item B<defaultbridge="NAME">
+=item B<vif.default.bridge="NAME">
 
 Configures the default bridge to set for virtual network devices.
 
+The old B<defaultbridge> option is deprecated and should not be used.
+
 Default: C<xenbr0>
 
 =item B<vif.default.gatewaydev="NAME">
diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
index 9a03ffffe3..b0caa3295b 100644
--- a/tools/examples/xl.conf
+++ b/tools/examples/xl.conf
@@ -23,3 +23,6 @@
 
 # default gateway device to use with vif-route hotplug script
 #vif.default.gatewaydev="eth0"
+
+# default bridge device to use with vif-bridge hotplug scripts
+#vif.default.bridge="xenbr0"
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 71561a49ef..9f45e4559f 100644
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -99,8 +99,17 @@ static void parse_global_config(const char *configfile,
     if (!xlu_cfg_get_string (config, "vifscript", &buf, 0))
         default_vifscript = strdup(buf);
 
-    if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0))
-	default_bridge = strdup(buf);
+    if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0)) {
+        fprintf(stderr, "the global config option defaultbridge is deprecated, "
+                        "please switch to vif.default.bridge\n");
+        free(default_bridge);
+        default_bridge = strdup(buf);
+    }
+
+    if (!xlu_cfg_get_string (config, "vif.default.bridge", &buf, 0)) {
+        free(default_bridge);
+        default_bridge = strdup(buf);
+    }
 
     if (!xlu_cfg_get_string (config, "vif.default.gatewaydev", &buf, 0))
         default_gatewaydev = strdup(buf);
-- 
2.30.2